Add feature #1

Initial work on the add feature