Begin potion refactor