Soe refactoring, did the ehader, waiting for logo