A working phase 3.5 with a test suite