Code

Updated group/apps closes #425