MOVE #4

Moved more code to client