work on case flow
almost there