Adding LazyAdapter to branch

adding lazy adapter to branch
merging conflicts

merging conflicts