finished moving the basic stuff