Added some config stuff that I'm not entirely happy with.  Might write my own.