almost sort of works now