Refactored as a class

Simple updates, I made sure every function had a "this->" in front of it. No public class variables were added but that may be a better way to get the name pieces out.