Need to finish comments and code