Committing before massive rewrite

This is the last of uthash