Took out adhoc, user control shizzle added to pages