Partially move analysis back to application

Retarded requirements.