Tobin Davis - 2018-01-27

Leaving this as open for now. This will require some heavy rework to the code and interface to support.