Marching into the backlog

Addressing bugs #26, #28 and #29