WIP on the doctor
Merge pull request #3017 from stankovski/profiledoctor

WIP on the doctor