primary features & bugs
tests
Merge pull request #56 from craigspaeth/wireup

@gib: Two levels of featuring and small bugs