Working 0616

@plapier: Moving forward I'll start breaking out tasks into branches for more concise pull requests.