Changes and additions for Montpelier mtm.

Signed-off-by: Bob Troester <joanske@sover.net>