updates to match class changes
refactor to match new class system
Merge branch 'master' of github.com:davewx7/Citadel