Cleanup, ensure the functions are run in the correct order
Cleanup, ensure the functions are run in the correct order

ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake