First pass at bringing some statistics into random-walk