added a bunch of TODOs to reflect work that still needs to be done