This is working now

UI in terms of markers is rough though