hopefully adding the context free things, for real this time.