Add Features -- working version but not tested