WIP final fix for thingys