Framework

closing this branch