First version of the modified Framework. Migrated code from the previous repo.