Wip fixmes and todos sip14 √