Added inline comments for testing and progress indication. Moved tests to a separate directory. Finished importing locator.cs.