GSA working to consolidate MAS's, establish electronic marketplace