COmmented out some future code which currently breaks app