Made app more generic.  Tied in config where it wasn't