Add ability to return states and begin to build table.