began to integrate two files.  Need to implement conditional aspect