Final Commit for Basic Template