pretty much done v2