Extend XBlockWrapper? Much of the code looks the same.