Started work on dynamic environment stuff