lots of updates to the application. It's working, but needs some improvements in terms of preformance...