unclear if it’d be better to head down that path now - or just patch this up