Some more advances...

... but far away of finishing it.