Updating to use AppInfo

IN PROGRESS

Not functional.