Major refacting of the app, code cleanup, 20% done