OT changes done, still need to update a script.
Almost there.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>