updated featureset. Branching remaining changes as they will be messy