Move to new modular diddlamen