closing #4

here is yet another branch