Add apps

Starting to think about not having this quite so split out