Final Commit, Minus Bug Fixes