my frodo feature branch

I think this last comment is the best
Alex