big messy commit, last minute changes, update fiche now working