And some additional funky bits

And some additional funky bits