got that kiwi in there issue #4 squashed, ready to write some tests