added jumping, needs testing v2, needs reorganizing