Fix everything up to actually work