Add some testing and begin to think the App for some metrics