Implemented some of the feature steps