rvieras/droidar updates

Here is the pull request you asked.  Just keep in mind I changed a lot. Let me know if you have any issues.