moving client code around
reverted all that moving around shit
more reversions