Added infrastructure to allow for multiple screens