Feature/definition list for

Closes #16