Refactored some files, and added Potion Dialogs.