blabla
merged
More work done on the framework.