Some progress. Still don't fully see the light though :-).

Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>