Move Maker things into MakerFunctions.py