App host dr

Have a look at the changes and commit message. Let me know how you go. Cheers.