First bunch of new features, retry...