Revert 46ff245..c2e7f0d

This rolls back to commit 46ff245aa9dad08e5443589d4df64863a1dfa469.
table made, first part done