working on a pretty decent revamp of v2 to get up to the app layer