Migrate rest of Code over to using DB

-TODO: This breaks saving on orientation change completely.