Added state manager - start at least