Some clean ups
Add a basic SQL structure