Rebase + Minor Refactoring

@everpeace Please review these changes to your proposal.  I will re-open your original PR on mesosphere/marathon.