No conflicts, but doesn't handle qualified names.
Major refactoring of everything, starting to come back together.