Closes #265 - closing in favor of an alternate PR