Big 'ol refactor of table