ok, I went a bit overboard with some refactoring, but mainly just moved some code around