Angular Extend

Adding extend functions.
Saving fixed

Fixed save/load calls and put the logic in the services.