Thesis Project Committed 3

Server code updated!