Feature/jw/main query #106

Closed swtpumpkin closed 7 years ago