Added some TODOs; updated to use  instead of console.log