Refacter screen to be a real class that gets instatiated