WIP comments per Tony and Mike