Started adding lights support