General implementation works with login CD and LS.

Some hooks after initial LS do not function