New version
Working plan 1.0 - we need more tests and contracts!