Adding initial code.
Remove swap files wrongly included.
Bug: CMethod ok now.