Added some more screens and did more typing