start of refactoring
Refactoring continues without testing
refactoring server complete, testing to start