Refactoring Database Organization, cleaning up the AppDelegate of funciontions that are not theirs.