Did a little clean up. I'm picking up this project again, added old functional ugly verison to look at