Refactor per Dr. Duncan's comments. Removed my add'l methods and just copy-pasted the crap over and over again :/