Closed #102 for now, there'll be more to do in press