Issue #152: Pick Up The Pieces

Issue #152: Pick Up The Pieces