Remaking some stuff.