5/23 changes
Merge branch 'reorganized' of github.com:wesesque/VB3 into reorganized