Renamed a few things
Fix naming
Fixed it all
Add dat