Tweaked a couple of service methods and added interfaces as constraints. Need to add data interaction tomorrow.