recklessly tearing everything out to try and clean up logic