changed some files to bring up to spec with new design model