Working on seperation
Next big thing: Client screen