GH #7 - Working on SQL related steps.