Added dictionary with associated values, conditionals and error-handling.