some progress on Calligra