Further "framework" refinements

Still silly code