wip, can do where clause now