Refactor as part of debugging.

Created update-display function.

Still trying to workout why this blows up on the second pass.