Started some more work on the Component Initial Save functions.