Boilerplate stuff, in progress
Revert "Boilerplate stuff, in progress"

This reverts commit b1fb02c0e6ed4528a4295ab4a029841b1a9da7e3.