Testing some tweaking for modularity.  May need to revert, we'll see