Update 16

Major Appery update. Needs to be reduced next round