Starting rewrite, skeleton controller and datastore