master: adding validators, trying to get imports across directories working