Some preliminar changes

Starting the end