Merged Git

The inital framework has been merged with this git, future development
will take place here.