@jonasschnelli I'd rather just get this merged ASAP and leave improvements to later. So if there's nothing breaking or obviously incorrect I'd like to just merge.