More tests passing-- changed some logic in move functions after talking to David, moved move logic to grid class, which calls move in shape if it is safe to move (no squares in way, not falling off grid, etc)