refactored machines, player stats, healthbar
merge in progress