more work mostly info windows and query stuff