TODO updates
cleanup goals
ff