More progress on invoice interface.