+playability stuff
+Did th cool
+Rebase continue merge