committing stuff from server
merge...I guess