added .cases.completion
fixed if/else
pieced together