Tables refactored, closes #19