Most coding done by Andrea Vitrano.
This corresponds to commit 6de5a081680f17432258357940b35c4d99a735c5 in the fiqus-dev repo.