Broke Cassandra & Rexter out into separate classes