Finished (for the most part) splitting main file, did some refactoring, developed Find more