-switch over to AsyncQueryHandler and modified most of the code to
accomodate it