added a move method and a couple other things