not working yet, but refactored to match comb.py