Fix spacing
Start work on saving queries