Added 9 more commits
Minor changes were also made to the pre-existing classes so they will adhere to camel case formatting