WIP on cleaning up specs