Combined my code with the homeScreen, Still work in progress