This commit contains the refactoring and rewriting of code.