Adapted marketMaker_draft to new class / filenames