cool. i'll leave it up to you to merge