added todo and commented debug console.logs