nearly finished w/ consumer updates