Things actually work(ish) now!