started working on DEE stuff
merge commit