A lot of work on updating the screen and organizing it. Kind of broken