Not done yet but hopfully soon tonight xD