Finished implementing the classification