Don't use tables, closes #5