removed console logs and completed TODOS