More progress
Make functional superclear