More progress on Humanoid class