Reworked - Final

Cleaned up code for Turn in - could be better but xcode was not
cooperating