still working on it
fixes file not loading right bug
made everything work in cli except load and find
Fix merge conflicts