Began implementing mixins and made revisions