Begun set up of classes, more accurate ids