Non-working / non-compiling..

Committed so Yan can see it.