WIP: Rework specs