Further profile work
Refactor to save the World
Extensible EP unit tests