were in a semi decent place need to fix cassandra imports now
merging