Updated Initial Working code push

Initial code push. Will be updated.