additions and todos