Feature/data tables

Fixes #4