refactor wip
exports working