[Devel] still implementing new visitor pattern