Add Targeting Row, Target Model, etc. Large update