Re-worked ENV vars and ADD to handle variables correctly