Refactored again 
because I'm an idiot
 to fit other naming
conventions.