Adding more TODOs removing code, removing duplication