some work on WAC stuff.