Greatly refactored table to not be separate