Sooo many changes, sorry. I think this is ready for testing, getting ready to do. -RB