#55: More integration