More work on said framework