Healthbar work in progress and merge