still working on threading
Merge branch 'testing' of https://github.com/CPSC491FileMaker/project into testing