WIP Cartridge Refactor

* Removed unused code
Merge pull request #40 from jwhonce/dev/format_markers

WIP Cartridge Refactor