Finishing the merge

More files for the sc work.

Signed-off-by: Joe Buck <jbbuck@gmail.com>