Moved more code to the Draw class. Will fix the current errors later, and finish the move.