Adding first part of new feature

Adding second part