o don't need a separate module anymore, simplified to the point where I'm back to something similar to 2.x