Not quite right, but making progress