Minor code tidying
Minor code tidying
Switch to using localhost cassandra
Support low priority tasks
Refactored out switch handling code