Began work on mashup builder
Basic mashup func completed. Still problem with main query