Added first features and steps