BeamModel Attempt

Another attempt at fixing BeamModel function calls.