New capsule form

Resolves #128