v2

nearly done