First commit of the advanced version of \!atApp