Feature set 1

Feature set 1 changes