Packaging properly

Still working on this, but (as ever) the little things like settings screens and packaging the app are taking more time than planned. Always the way, eh?