Final Merge of our final project code
**WORK FROM THIS CODE FROM HERE ON OUT**