Finish rest of todos. For now.
Refactored a bit, added a service manager