Small Progress. Mainly a sync commit