Commit #67 - Going to bed. Back tomorrow.