Working towards distributable versions of the app