Resolve merge conflict
Work out Xero API, first cut of scenarios

2:00 with @Floppy