refactor of var, etc and now tests run