functional!
Merge pull request #1 from Mavvie/switch-to-tables

functional!