Restructured app.'s. Added some stuff to marcus.