First of many map updates

Applied Count's map then started updating it.  I cannot say that it will
even compile.