WIP - trying to fix more specs