Lots of changes, demo_dmp is the main executable.