Potential CME's and issues with pistons, we'll work through this on a separate branch and re-add it when appropriate