added more TODOs, tons of TODOs