[WIP] Newspec stage 2.