Add initial work on unify