Refactor in prep for new code
Refactor in prep for new code

pyinvoke/invoke,singingwolfboy/invoke,frol/invoke,pfmoore/invoke,mattrobenolt/invoke,kejbaly2/invoke,sophacles/invoke,tyewang/invoke,mkusz/invoke,mattrobenolt/invoke,frol/invoke,pyinvoke/invoke,kejbaly2/invoke,pfmoore/invoke,mkusz/invoke