First Commit WIth Working code