12/12/14

Worked on completion blocks to allow one or the other parameter. Cleaned up some more.