added import (wip), small refactor