temp features and formals for jay
Fixed merge conflicts
rules of production done