@josenavas and I actually just did that after the meeting today. Ended up making things much easier since we can reuse sql query functions