Superb merge, with only a few features to be implemented