more hickory, refactors...