First commit with new stuff for D2