Turning it into more of a framework