Base mechanics updated
Conflict merge for base mechanics