Significant changes. see extended message

Reverting back several changes that were made incorrectly.
Lots of checks were simply deleted, tempates given as filepaths were
replaced incorrectly with filename, among a few other things. Overall
the proposed logic of having a dictionary was kept.

Author: rthedin