A small bit more work.

I'm still trying to decide how to handle the rest of the language. Do we track
imports, reassignments, etc.?
Still trying to come up with a clean impl