Smashing with the modernization hammer

Closes #2