Added more things for @stevencl to approve

Let's see if this works!