First pass on #249