Final Commit with complete User Story# 1