Added some more screens and did more typing
Merged (finally) with Andrew's changes