Update todo and add unique features