merged tar into main class and finished other stubs