Final Commit

Third rebuild from scratch. Whooo!