Updating TODO with notes from Brian