Wali Raheem

I'm not sure most of this would be a good idea for myself looking this code a year later, let alone a junior dev trying to maintain it...