Cleaned up labelling, need to decide final classes