WIP - re-connecting the marker attaching functionality