Beginning major refactor of API
Getting closer, still have to implement bear movement