Finishing the first push of refactoring, yay