Updated to Finalized Code to Start With