[WIP] Working on change detection

This PR is a **WIP**

I expect to push more commits to this branch.