Refactored, tested tables in nether