added new TODOs, broke authentication