major re-org

Removed markup_base and markup_labour as they seemed redundant and
cluttered the code.