Starting to clean up the operation of the application itself (as opposed to packaging issues)