Final Version

Updates for Keith and David's project