Main dev

Adding current working framework to master