fixing exports and imports
working on cleanup
fixing merge issues