Better table handling. Woot for controller-view action.