Started refactor of the "create" queries/tasks.