Finished class
Minor