App rebuild

MONSTER MERGE