Pruning out transfer stuff. Just want serv and client code here. Transfer will be a submodule