Add todo
Make environment updates automatic
Make environment swtiching work right