Resolves #75 by adding in "application" awareness