Made initial mods to pass all tests, still have generic app