added a real nice TODO