Finishing out the commenting TODOs