Implemented BaseAdapter
Ready...maybe
Merge remote-tracking branch 'origin/master'