Agreed! Sounds like a good plan for the future, but this seemed/seems like a good fix for now to me, until it get's completely rewritten eventually 🙂