sort of works now, next up is editing