finished v2 of app