Adding back some ast stuff that got lost somewhere.
Commit for group collab on multiple types