Save spot - I think I finished refactor command handling and the api....time to test to see how much I broke.