did a big refactor to the screen objects