Merged the two classes and made minor edits to multiple files.