yeah, whatever
Merge github.com:BrantCarlson/CAERENet

merging in major reorg from github