Final code for review

Done with the assignment with all components.