so gross, but tests currently pass
just a little grossness removed
currently all tests pass
panic tests work