spec data refactor
wip