Not working, trying to restructure app