WIP: rearrange client code to approach some semblance of modularity someday
WIP: rearrange client code to approach some semblance of modularity someday

basho/machi,cmeiklejohn/machi,basho/machi,basho/machi,cmeiklejohn/machi