- Fixed some dependency resolution
- Some more work