Doing some work to maybe solve #265 eventually