done with ui and all queries to date