Initial commit. Add the changes I made in Teo's framework.