Server side code is all working with todo's placed within each class where needed
Fixed conflicts