Went ahead and resolved the errors by adding methods to Application
class, and added TODO comments in other classes.