everything seems to be working on v2 now
moved shitty testes over to v2
move things from v2 package to root
Ok done for now!  basic conditions work!