I need to make this considerably less brittle.