I agree that it's rather dense. I'll hopefully get a chance to spend some time on refactoring this and the specs this weekend.