table.rs: Overhaul