Added more CSM code.

Signed-off-by: Strakas <reetopps6@hotmail.com>