Refactored DE. Ready for Iteration 2 development.