handcart2034

Thanks for the suggestions and the RegEx simplification, all of them have been implemented, along with a couple tests and document updates.