More work with March D and E user stories

Found a problem with memory leaks though.

Trying to track that down.