+ little correction, part 2, still not runnable, but almost