Now that it works, add some removed stuff back in.