Finally working again, although a lot if probably broken still