update multiple merge
wip. trying to connect the two systems
wip. add visual marker and other stuff
it's alive.