moving to #94 (getting lost in the htreads here so migrating the bigber issues to actual issues)