Phase 2- initial commit

Fuzzy matching test code - in progress
Separation of code from UI - in progress