Final Commit of 1st Year Exemption Project - All bugs found during testing fixed.