syncing changes

not sure if everything is here since the eclipse git plugin discarded
some changes before I backed the files up.... Couldn't test everything
working on problem with persistence atm.