Top part finally working
Merge branch 'dev' of https://github.com/magwitch324/wpi-suite into dev