Updating TODOs and adding Node familiarity