Wrap sql
Cleaned up and started with specs