xla

ab44d7a9 - Address comments and add tests