refactoring
new queries
new repo