Updated with more TODOs