Pull request

Hi,

The history is still super messed up. Commit messages wise it's not clear. We have to untangle things. I will be doing this tonight. It shall need a lot of time I think.

Best,
Aruna