The other half of the refactor -_-