I'm hoping this makes things cleaner instead of being dumb