all features working
Merge branch 'master' of https://github.com/jeffnv/aa_work
phase 4 complete