Complete Re-work to match Assignment Standards