Step 1 of another Digital Miner refactor