WIP: added first wave of specs