Cerretani

Here's some stuff to merge.