WIP: Better sauce

This is WIP, please don't merge yet.