Adding Sonar code, WIP