starting to clean up the code, it's at an okay stopping point before class...