Commit 57

Prep work for heroes tomorrow.