Added stuff that somehow got left out of first commit