Added potato and wheat classes + tidying up