Added files that Martin worked on