Updated to Applause. Project refactor