Done till attaching Adapter
Completed all TODO
Merging