Started working on #72. Work in progress, but mostly done. Feedback could be made meanwhile. Subtasks:
Closes #72