Updated for handling dependencies and fatal errors, work still needed. (Bug #84)