Restarting a lot of project. Hammer out final api