Closer to the Pump.io support. More tests written and passed...