Reid Burke

@hammadj I'd need feedback from @zertosh about what to do with the single failing test. Would be glad to mark "ready for review" once I hear a good solution for...