Move Doddle out of __init__