logic initial refactor
Merge pull request #6 from Neob91/abstract-logic

logic initial refactor