Start implementing env lookup and update