Intermediate commit.

Lots of junk here - Committing to preserve current state.