Implemented a couple things in Application

Implemented a couple things.