[WIP/RFC] Rewrite things