Added some TODO's and basic environmental context