Pretty much the second option, there will still be some minor changes in the demo but not sure when, probably close to the release!
