Cleanup and support for destination_url parameter

This definitely needs to be updated.