major refactor and disabling export for now