Minor Restructuring, working on getting input to work