Fixed Something & Testing TODO: Better Reflection Integration!