moved a bunch of stuff clientside