Feature/epv

First start for getting EPV working. This hasn't been tested yet, so please don't merge (yet).