Made class for application, more OO