Milestone2

@sshihata 
I have added every thing related to the data so that you will have everything I have.
Check these stuff and tell me what do you think