fingers crossed that this works, this would simplify SO much stuff