Final changes, table is still not dynamic and
only a working-copy implemenattion