Another try, this time removing applicaiton.h