Added plans for a new user interface and refactored other classes.