TMP commit - untested

Resintall dev machine - archive