Did a cleanup of APITableModel. Working on integrating