Adding Frankenstein's Monster and related infrastructure