PLEASE WORK.  Re added in all the stuff.