Added #133 for this. Outside the scope of what I wanted to accomplish here!