Continuing work on Commit-23

New Item / Block work