added lots of stuff.  not sure what though...