Got Everything Working - Cleaned Up Code - Adding Comments Back