Updated with TODOs and meeting changes