[WIP] For the next release I want to do something different