Working! Commit this, then go clean up.