Reorganized the methods in Piece. Forgot to switch to branch...