More work on simple installer