first stab at #17

ready to be merged (noticed you've started on my new #28 already - thx mate!)