Core pr 3

* Updated make file.
* Code clean up.
* Updated to match ding_user and ding_provider PR's.