Merged Classes

Need to separate into multiple class files and organize variables and
methods.