Closes #23 Adding lazy querying