This really should have been multiple commits.