Add controller logic including color