Flesh out the handles a little more