CS - initial work for fully awesome.