Added to TODO in bcu.py