todo updates (wow shit is actually going away!)