Macebobo

All changes are ready for review for the first version of the importing.