@dchelimsky I refactored the names and the way they're run slightly, WDYT?