Feature/add ecp

Resolves #123 and #126