Finished coding and comments