Post-final

Preparing code to allow for unspecified number of markers