got activities service working and connected db
merged vincents changes with erics changes
cleaned up some bugs