added and moved a bunch of stuff