Finished Thread View. Finished refactoring Map files and other small changes.