still trying to fix the screen. cleaned up some code along the way