finishing up commitments
Merge branch 'dev2-merged' of https://github.com/magwitch324/wpi-suite into dev2-merged