Yay for incremental refactoring! :+1: