Feature/api queries stars

Yes it would. I will spend most of this week refactoring.