before changing stuff to app constructor