WIP (commited so I can work from other place). Nothing to see here.