Completed all comments and test. Good to go