Extract to this

Closes #21