Hackbuggaroo

Okay, @techfreek take a look at this.

Modification of issue #16.