Your comments

wouldn't patch integration help solve this?