Now everything works, ish