Finished all code and commenting