Good stopping point to roll back to fif I fuck something up while refactoring...