Plz work
ready to accept chris commit
Merge remote-tracking branch 'origin/master'
Massive Code Cleanup