Better starting state
Huge reorganization of the code in progress