Alex's SQL stack items' changes

I hate git merge