client server imporvments and modularity
Merge branch 'master' of https://github.com/kh901/Elements