Move some DOG bits into the framework