Loaded in changes done at work.

I had to manually copy files over because of github crash... Hopefully
its fixed now...
Revert "Loaded in changes done at work."

This reverts commit e462447a5675fdee17b3fef791a792923e1eea08.
Loading in changes done at work.

Had to do it manually...