Feature/medium model

Fixes #78