Continued to flesh out functionality of being able to build query schema into well formed array