Stashing some work.

Signed-off-by: Ronald Huizer <r.huizer@xs4all.nl>