More Adapter Changes -- trying to nail down why sometimes things don't load correctly...
Merge branch 'master' of https://github.com/glp115/IST412