Cleaned crap up. using a different repo for v2