continue extact functionality from DEMO app
finish extracting functionality from DEMO. add sonar metrics