#129 WIP - one spec still fails