attempting to rework dependency management
bug fixes