Moved queries to module
Add rough state module
Fixed cell writer and module setup