changed framework around still more to go i think