Haven't committed in a while, but going to start working on this again.
Committing old changes now.