princefisher

@goekay the PR shows as out of sync with base branch, any chance you can update the PR? @joelittlejohn is there anything else required to get this feature merged? I...