Working on issue 02. This is a work in progress... read it as I'm writing it :-)