Added second screen, lots of functionality