Moved application set up calls to actual application