First swing at client to server reevaluation
Merge pull request #5 from sedge/issue58

First swing at client to server reevaluation