playing around with restructuring the framework