Broken Commit

This is a broken commit for history purposes. A complete rewrite will
be done for the next commit.