99% Commit, only small tweaks remain

May 9th, 2013