Eta casestudy

Up to date with master, ready to go!