Initial SCMS commit; Still very much WIP