Started on #159 with new gem that may or may not work.