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

Get up to date!
Merge https://github.com/ryanbaylorkillea/wpi-suite