first pass at the necessary system app changes