Updated Initial Working code push