Working on remaining TODOs