Last commit broke it. Putting some stuff back.