a nimor refactoring
marrasputki initial stuff