Added and Fixed the ArrayAdapters

See title
Merge remote-tracking branch 'origin/Matthew-Copy' into master-copy_mason