removed old main class and finished HashMap