Pushing for the day so as not to create STRANGE MERGE CONFLICTS ARG...
I implemented a bunch of changes, found errors, stashed, and I am in the middle of fixing those errors. This push SHOULD be stable and contains edits to the code that streamline the saving process, account for the errors I was having, and paves the way for me to re-implement my changes. Yay for saving code in Notepad++ on the side and then slowly working through the differences in the HEAD copy...