made more conversions; started preparing to add queries