Not sure if this is the right approach, feels a bit like using dirty bandages.