This PR contains all the work done so far during GSOC [only for showing work], we follow a git rebase approach.