Update progress on attempt to DRY up some more repititious code