Lots of changes, mainly added Noms controller with errors.