Removed extra code, fixed up remote client
Merged and fixed up transitions