working commit/added a ton of stuff for final screens