Updated a lot of table additions and logic