Added untested validation module. Minor tweaks to get this working