halfway through fixing staticness