Still partially broken but getting closer...