updated the framework
almost done
Framework done, though there may be errors
something
fix merge probs