Framework update and old master added to attic.
WIP, updating base code.