[WIP] Work towards 2.0