Take out usage of extends for now until we figure out why it breaks the app