Large Commit

cleaned up comments and worked on some logic for move