actually works now, sorry for pushing broken code