Complete with manual CIB

Tested/working