Refactor lcstate CIDEVCOI-667

DO NOT MERGE YET.

These are the interface changes for the lcstate refactoring