Committing the class, documentation will be written soon