Made some progress. Finally. Nothing too drastic in the end. Phew! 

Also, any news about the IC, [@xodus]?