Added some todos, thanks and disclaimer