Implemented Fiona
Merge branch 'Fiona'