refactored a bunch of stuff, started using services
fixed destiny bug