(incomplete) Move standalone client off this project