Story 18 done a little more