hopefully adding the context free things?