WIP - Allow range and from queries

fixes #19