Added screens and increased functionality
Blah