Working app once again.. yay