about to refactor some things that aren't working or aren't needed…

…was experimenting with some stuff, and getting distracted, so this commit
is so i can move on but refer back to that stuff later.
Completed the project requirements. No extra credit yet