Comments and clean up
Merge branch 'feature-crud' of github.com:JustDuckItAll/wpi-suite into feature-crud