Cleaning up. Also adding different Screens and Controllers. Working on
input.