Marker Update

Redid Nolux his Marker Update, needs testing.