New marker list implementation.

Feels more robust, despite being simpler. Need to weed out invalid markers tho.