Feature/initial cut

to query