Initial import of Anna
and other changes... lazy commits