Master coordinate matching done - comments/clean-up of code coming in next commit