Closer to something working again :P