Sadly this will require a little more reworking that I am comfortable in this ticket.