wip transform

I think we should avoid sometimes returning undefined for our functions, feels like bad JS practise to me, can we return null instead?