Merge https://github.com/ryanbaylorkillea/wpi-suite
Merge https://github.com/ryanbaylorkillea/wpi-suite