Framework should be pretty much done