working on mvp server
for Joseph
Merge pull request #35 from FarhadG/mvp

Mvp server in progress (for Joseph)