Adds service, corrects all issues. Version 0.1 finished