Added environment init call + todo update