Yay! More refactoring!