Revert "Revert "Add support for Cinder""

This reverts commit 33c0911b14c90057a83ebb5270ffa9de16e352dc.
Just an update for class comments