I'm working on unit tests, I promise