More tests on line.
Working on state management.