WIP. rehash not working? otherwise everything seems in place