Almost there. Stuff is in tests for now