beginning new changes, migrate to single tables