Move big tables to appendix
Begin refactor