big ol refactor.
Merge branch 'master' of https://github.com/colinmxs/treefort.git