Some more work...
Signed-off-by:Craig Russell <tenowg@gmail.com>