WIP: client command line now works, some new server bits