Fleshed out UnitVisitor functionality