#16 Is almost fixed. Test has to be finished.