Update spec to have a better spec w/out implementing too much