Rebase from Slim

*finally it boots