Solved one problem, first item was being overlooked as it was
being matched and discarded.  Also added many files for testing
purposes
Added some extra notes and matching templates