Hopefully adds the rest of #17. ...Please?