Started on getting --local to merge properly. Needs lots more testing!