Last commit was accident. This was supposed to be it.

DP working, EOM not so much.