Recommitting Changes made earlier.

[kdangel]

This should have everything that I have implemented. I had to work from memory due to mac's sucky source control wiping my changes.