A little update from the past months. Not done yet