Adds some missing stuff that I had neglected to commit before