Merge branch 'matthew'
i removed and such