Added more functionality to app