WIP: Refactor presets