Finished refactoring basic MVC for the Client Server system.  In addition various minor changes in terms of getters/setters breaking various parts of the MVC conversion.