finished the framework changes just in time for school