Should make it boot 1/2

Another commit may be needed.