Yeah that would be the solution, but I think that means to discard almost everything and write Yappari from scratch.