Changed Naming Conventions, I really rushed this out...