Fix everything to actually work