Changed pigeon map object adding two methods.  First templates are just about done, almost ready to test rule generation.