Table changes

Accidentally merged the two versions of the project earlier, so, this is an attempt to split them apart again to work with them more easily.