more or less finished up value classes, needs review