Services and small changes
Merged my initial commits to mitch's stuff