Made some headway, causing NPE though.