starting major refactoring to migrate to cassandra