Should (almost) be finished

Need to do some testing with the virutal machine but most things should
be in.