added second table, still rough.