Made progress but haven't quite fixed the request spec