Added some stuff, moved screen stuff to own file.