Added some logs and todo's