Started to rebuild CSurroundCount
expanding almost works now.