Issue #3

Half way there