update

framework 80% complete