Refactor Dictator

The Dictator is coming back, badder than ever.